Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 13 Apr 2010 22:49:24 +0000 (22:49 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 13 Apr 2010 22:49:24 +0000 (22:49 +0000)
commit5fbfe68776f3c7b2545dd408a56c736cd386ef34
tree920f0d337033cd5ad71ec4074f9a52efa09a31f4
parentdb343dda3673e50d77b7a7460792e8519e35d379
parentefd9ed7ead27116590d655ceceb7b6dc46e2401c
Merge from mainline.